Merge from emacs-24; up to r111231

diff --cc doc/misc/ChangeLog
index 5e21a91bccd14f08439735e959418b7321e18854,88d7a35c6212f1b91474e34bca8598c217ac2d85..026f25d2536e26c9890dbd1ff21b7a9f86c0bdac
--- 1/doc/misc/ChangeLog
--- 2/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,4 -1,11 +1,11 @@@
 -2013-02-06  Glenn Morris  <rgm@gnu.org>
+ 2013-02-07  Bastien Guerry  <bzg@gnu.org>
+ 
+       * org.texi (References): Clarify an example.
+       (Installation): Fix instructions.
+       (Org-Plot): Fix link.
+       (Checkboxes, Radio lists): Fix typos.
+ 
 +2013-02-07  Glenn Morris  <rgm@gnu.org>
  
        * cl.texi (Equality Predicates): Mention memql.
  

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/gnus/ChangeLog
Simple merge

diff --cc lisp/org/ChangeLog
Simple merge

diff --cc lisp/org/org-bibtex.el
Simple merge